* callproc.c (init_callproc): Move the initialization of

	Vprocess_environment to its own function.
	(set_process_environment): This is that.
	* emacs.c (main): Call set_process_environment earlier than
	init_callproc.

diff --git a/src/emacs.c b/src/emacs.c
index 9209e4f7d6b7faa82947a5a23e424af59ea6b434..4dcdbc328e4548b3723b16f09fa70dc541d940e4 100644 (file)
--- a/src/emacs.c
+++ b/src/emacs.c
@@ -426,6 +426,12 @@ main (argc, argv, envp)
   init_alloc ();
   init_eval ();
   init_data ();
+
+  /* egetenv is a pretty low-level facility, which may get called in
+     many circumstances; it seems flimsy to put off initializing it
+     until calling init_callproc.  */
+  set_process_environment ();
+
   init_lread ();
 
   init_cmdargs (argc, argv, skip_args);        /* Create list Vcommand_line_args */